Skip to content

Fix Purple Dildo and Silver Vibrator weapon names #3801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 9 commits into from
Jul 31, 2025
Merged

Fix Purple Dildo and Silver Vibrator weapon names #3801

merged 9 commits into from
Jul 31, 2025
+8 −8

Conversation

Fernando-A-Rocha
Copy link
Contributor

Fixes #514

@TheNormalnij
Copy link
Member

Let's merge it with 1.6.1 release, to avoid potential regression.

@TheNormalnij TheNormalnij added backwards-incompatible Should be merged after the release of 1.7.1 bugfix Solution to a bug of any kind labels Oct 16, 2024
@TheNormalnij TheNormalnij added this to the 1.6.1 milestone Oct 16, 2024
@blow1d
Copy link

blow1d commented Jun 1, 2025

😶‍🌫️

@Fernando-A-Rocha
Copy link
Contributor Author

Fernando-A-Rocha commented Jun 4, 2025 •
edited
Loading

@PlatinMTA found that Silver Vibrator ID 13 has been considered as an invalid ID (can't use in functions like giveWeapon and it's missing from the wiki weapons list!), but it's perfectly valid.....
So I updated IsValidWeaponID to not prevent it from being spawned, and now you can spawn a silver vibrator lol. Do note that it's always been a valid weapon ID on samp, with object model ID 324.

@Fernando-A-Rocha
Copy link
Contributor Author

image

@Fernando-A-Rocha
Copy link
Contributor Author

✅ Thanks @AlexTMjugador for noticing the need for editing pickup weapon object model ids lists

@botder botder modified the milestones: 1.7, Next Release (1.6.2) Jul 31, 2025
@botder botder merged commit 886194e into multitheftauto:master Jul 31, 2025
6 checks passed
MTABot pushed a commit that referenced this pull request Jul 31, 2025
@github-actions
Synchronize changes from 1.6 master branch [ci skip]
a600074 
886194e Fix Purple Dildo and Silver Vibrator weapon names (PR #3801, Fixes #514)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@botder botder botder approved these changes

@TracerDS TracerDS TracerDS approved these changes

Assignees
No one assigned
Labels
backwards-incompatible Should be merged after the release of 1.7.1 bugfix Solution to a bug of any kind
Projects
None yet
Milestone
1.7.1
Development

Successfully merging this pull request may close these issues.

getWeaponNameFromID() returns duplicate ID's for 10/11 and 12/13
6 participants
@Fernando-A-Rocha @TheNormalnij @blow1d @botder @TracerDS @tederis